From 4e4c248077f24add1ccf133a54585434461d680f Mon Sep 17 00:00:00 2001 From: Jehan Date: Sat, 23 Nov 2013 18:35:18 +1300 Subject: [PATCH] Bug 712536 - Themes with gap_(start|end)_file but no actual file crash Code factorization in commit 34fd123 reintroduced bug fixed in 0d396ab with non-equivalent factorized tests. --- modules/engines/pixbuf/pixbuf-rc-style.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/modules/engines/pixbuf/pixbuf-rc-style.c b/modules/engines/pixbuf/pixbuf-rc-style.c index 57cb3b31e5..e672f0c23e 100644 --- a/modules/engines/pixbuf/pixbuf-rc-style.c +++ b/modules/engines/pixbuf/pixbuf-rc-style.c @@ -765,17 +765,14 @@ theme_parse_image(GtkSettings *settings, if (data->overlay && !data->overlay->filename) clear_theme_pixbuf_and_warn (&data->overlay, scanner, "Overlay image options specified without filename"); - if (!data->gap->filename) - { - if (data->gap) - clear_theme_pixbuf_and_warn (&data->gap, scanner, "Gap image options specified without filename"); + if (data->gap && !data->gap->filename) + clear_theme_pixbuf_and_warn (&data->gap, scanner, "Gap image options specified without filename"); - if (data->gap_start) - clear_theme_pixbuf_and_warn (&data->gap_start, scanner, "Gap start image options specified without filename"); + if (data->gap_start && !data->gap_start->filename) + clear_theme_pixbuf_and_warn (&data->gap_start, scanner, "Gap start image options specified without filename"); - if (data->gap_end) - clear_theme_pixbuf_and_warn (&data->gap_end, scanner, "Gap end image options specified without filename"); - } + if (data->gap_end && !data->gap_end->filename) + clear_theme_pixbuf_and_warn (&data->gap_end, scanner, "Gap end image options specified without filename"); if (token != G_TOKEN_RIGHT_CURLY) { -- 2.30.2